Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 15 Jan 2012 06:04:52 +0000 (22:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 15 Jan 2012 06:04:52 +0000 (22:04 -0800)

Trivial merge